finish code refactor for forms in topic and work review