house cleaning: delete unneeded comments & whitespace, alphabatize methods & imports