Format
Use results of Validations where possible
Remove useless enums
Fix code in AttributeFilterBuilder