Apply Chris's suggestions.