Improve readability again