Ran through validator and made edits.