Cleaned up source according to PEP8