tweaks for readability and convention