Minor refactoring changes.
Merge pull request #4 from RBertram/dev

Minor refactoring changes.