Going point free where possible