removed comments and refactored some logic
Merge pull request #11 from dsilva609/milestone3--cleanup

removed comments and refactored some logic