Improve code conventions.