Syntax cleanup
Added yellow highlight to date field as well