Remove unnecessary import
Reformat code