class return refactor