Style improvements. Part 5.