some cleanup
code standards
Merge pull request #3 from willtp87/7.x

7.x