format/cleanup