OCD cleanup
OCD cleanup + refactoring
Merge pull request #2 from rupaheizu/master

OCD cleanup