Fixed some indentation issues.
Removed unused imports from the class.