Refactored Everything