KISS refactor