Minor code clean up
Merge branch 'cleanup' of https://github.com/abstractj/nodyn into abstractj-cleanup