Lightweight refactoring before 0.2 bump