Adjusting various code conventions