Code Formatting & Removing unused imports