Removed unused imports
Mass reformat to cleanup codebase