Removed unused imports, whitespace