cleaned up key mappings