refactored for PEP8