updating to code conventions