#232 minor reformat/de-duplication