Validator added, coding standard, simplified