Format code/organise imports

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