Tidy things up

Small pep8 fixes
Minor changes