I didn't comment everywhere, but this happens a lot; whatever you standardize on, you should change the rest of this file too.