Improve default shortcuts
Fix coding style