CLIMATE-341: Adjust formatting for pep8 compliance