cleaned up returns