some code readability updates