Improved readability a little