refactor, cleanup, niceify
@0.3.0