Improve for generation readability