Cleaned up unused imports and whitespace