Style improvements. Part 7.