Simple refactoring
Merge pull request #16 from Hinidu/refactoring

Simple refactoring. 2nd attempt