refactored to PEP 8