Keenum refactoring