self code-review based changes for clarity / cleanliness