Fixing a few indentation issues, and removing all accelerators from accelerator list