removed unused imports, cleaned a few parts
Formatted everything