Applied some of Craig's suggestions.