Revise class methods, remove arbitrary scope