Refactor for avoiding multiple forms, ref #118