Code formatting
Fix shortcut problems