Fix bracket style
Un-reorder import statement