Some cleanup in fillFormCtrl