Minor, remove replicated code