refactoring
No need to change this - revert back to original
Merge pull request #6 from davidjoos/master

Small improvements, fixes #6