Refacting to use Form helper