some minor fixes

formatting and removed unused imports