cleaned up keyboard shortcuts