Some formatting changes in accordance with pep8 recommendations.