Reformat code & maven pom-s, optimize imports