Form Ability Fix and Cleanup