reformat for more conventional style
reformat for conventional style, and refer to fns without the reader macro