Fixes formating issues and useless module imports