Removing explicit returns