Minor refactoring #104

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