cleanup of return type