Improve the readability a bit