change form methods and code cleanup