Minor changes

Just some minor changes and first attempt to respect pep8.