refactoring and one more form.

Signed-off-by: jredden <jredden@pricegrabber.com>