Refactored the whole shindig