Minor refactorings
Merge pull request #212 from joneslee85/patch-5

Minor refactorings