validator edits & cleanup