Refactoring. No need to override __init__ method