cleaned up some coding standard issues
Merge branch '1.8'