More shift to functional style