put return into separate class