minor code readability tweaks