Project cleanup, reformat style, organise imports