Standeards Validation Commit

Fixed standards validation issues.