Improve readability?