fix bad code smell in forms