* Removed more bad imports
* Refactored