Reformat code and imports optimization