Refactor modal forms