Use @classmethod consistently

use classmethod as decorator