Big batch o' style changes