Final clean up from Mack's comments