Refactoring. Add property and staticmethod decorators.