Code Formatting and removing unused imports