comments and some code cleanup
fixing comment from merge
Comments and cleaning code