Updating ifs

Updated ifs, and added validation feedback
Removing things that aren't needed

Removed some unneeded if statements and prints