[NEXUS-5800] Reformat/Optimise imports

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>