Refactor in triple programming session

Dude, change this shiz.