removed unused imports
Cleaned code, switched to camelCase.