Refactored to be beautiful

* Deleted much code
* Works beautifully