Fix methods to use self to call class methods