refactor atendimento forms