refactor dot forms