#51: Code refactoring, added class properties