Touchups: to code readability