Slightly improved readability