Change Shortcut and Remove comments