Refactor more instance methods to be computed