More formatting fix + unused imports removal