Minor readability improvements and clean-up