Additional stylistic changes.