Removed unused imports and switched spaces to tabs