Minor simplification and formatting.