Refactoring and minor improvements
Merge pull request #5 from jtyr/improvements

Refactoring and minor improvements