fixed a few coding conventions issues