Applied Craig's suggestions.