Simplified input validation
Minor naming tweak
Minor naming tweak