Reformatting: new style is default intellij style/import ordering, except using tabs instead of spaces.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>