fixed up coding conventions