removing comments, general cleanup
removing comments, general cleanup