fixed some OptimusCrime dirt, cleanup and PEP8