Better code organization, non-standard character check.