Finished up validator refactoring. Minor edits