Only output errors for relevant field next to field.
Rename variable to be clearer
Fix indentation