Cleaned up some coding standard stuff.