Simplified input validation
Minor naming tweak