Cleaned up based on PEP8