Quick refactor

tiny cleanup for the current version. @kory75 please review!