minor tweaks to help code understanding