Cleaned up return logic.