Cleanup for PEP8
More tidying up