Updated to clean up for PEP8