Consolidated validations: fixed ids and error messages + cleanup of some code smells
13 files changed