refactor, cleaning queue form