Added my own touches
Removed unused imports
Renamed obfuscated names
Fixed some warnings