refractor of forms and consolidating to one place