converted output to use a class and a form