Massive Code reformat and Optimizing imports