Refactor - this/@ instead of self