coding cleanup.
Merge pull request #450 from JacksonRiver/7.x-4.x-coder_cleanup

coding cleanup.