Fixed some indentation and import orderings