#10 refactor - cleanup/refactor