some code reading clarity tweaks