some code comments, fix some indentation issues