Removed unnecessary logic, better error output, fix repeat validation