refactor status form