refactor student forms