Changes to fit code conventions