pep8 changes
Keep it DRY