Removed dupes
Changed language on failure
Moved helpers into helpers