Migration to point free notation