Minor refactoring #104

Merged
weskerfoot merged 3 commits from refactor into master 4 years ago