Cleaned up keymapping a little bit