Changes to ensure PEP 8 compliance

Most these changes are indentation and line length related.