Refactor classification form