Small refactoring, rethinking of design