Fixing nits in code to unclutter my patch