Clean up white-spaces and python syntax to be PEP compliance