Perform some small refactorings
Merge pull request #8 from promptworks/small-refactorings

Perform some small refactorings