very minor tweaks for better style