A few readability refactors.