Introduced properties
Little refactoring and PEP 8 compliance