Style improvements. Part 6.