Improve naming & comments