More refactoring in keysToScreen