Code refactoring and clean up
Updated README.md
Merge pull request #90 from RITAccess/refactoring

Code refactoring and clean up