return from api cleaned up