Removed return from single expressions, simplified