Apply Craig's suggestions.