Code reformat and import cleanup