Some Clean Up
Naming Errors Fixed
Fixing merge conflicts
Merge pull request #5 from tedyhabtegebrial/master

Merging the clean-ups