Formatting and removed unused imports