Human readability improvements