reformat code & omptimize imports