code conventions

minor changes to make code conventions more consistent