Reformatted code again optimised for 80 columns