final pass on formatting