Fix: refactored according to PEP257