Cleaned up the returns