target forms refactoring