KISS refactoring