change more direct calls of classmethod to @classmethod decorators