improve validation w/ regular expressions