formmating cleanup