Refactored everything
Refactored everything
Clean