Add Accelerators and remove PEP8 errors