refactoring the code to be smaller and neater
Merge pull request #1 from MichiganCliffy/refactoring

refactoring the code to be smaller and neater