Slight tweaks for readability