Fix code formatting and removes useless imports