* Refactored some more