Improve adherence to code conventions.