Improve readability somewhat