cleaning up comments & junk