refactor text fields