Code cleanup / consistency.