formageddon changes. controller cleanup