Small readability improvements