Apply Anthony's suggestions.