I added / removed bunch of things in this file, I don't think there was much whitespace changes