HUGE style commit, probably should have broken this one up