PEP8, refactoring, changed staticmethods to classmethods