commit before keyboard refactor