Remove unnecessary import and reformat code