fixed up some coding conventions.