Move things to class method