Code style and code cleanup.
Merge pull request #2 from jordandukart/7.x

Code style and code cleanup.