minor refactoring
Merge pull request #142 from jgawor/extensibility_2

Minor refactoring