Cleaned up file for PEP8 + no keyerrors