minor stylistic changes re format()