Readability cleanup, part 1
Readability cleanup, part 2