small refactoring and stub for new features