cleanup exports and whitespace, unify imports