Clean up formmating