Fixed all of Brinkman's comments