Reformat/Optimise imports

Leftovers.

(Dunno why IDEA did not reformat this sources as I reformatted all java sources)

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>