Improve readability a bit