-Did some more refactoring
-Did some cleanup (removing comments and research code)