cleaned up minor code comments, cleaned filenames