Refactor Form interface to class