optimise imports, cleanup and formating thx to liclipse