inf-103 refactoring
Merge pull request #2 from robert-hickey/inf-103

inf-103 refactoring