Syntax readability updates