Minor coding style fixes
Added directive to control custom validation message