Started applying Craig's suggestions.