Address todo comments from refactoring
Merge pull request #132 from chuckdumont/jaggr-core

Address todo comments from refactoring