refactoring stage1
Merge pull request #62 from Nayan/refact

Refactoring stage1