refactored code and and cleared remaining comments
Merge pull request #37 from daino3/refactoring_code

Refactored Code