Changes to formatting and using point-free style.