changed validation message + minor refactoring