04 - Readability improvements