code standards
Merge pull request #1 from willtp87/7.x

code standards