refactored to respect PEP8