remove extra returns in operator=