Reverted some changes that I had made that got reverted in the last patch.
Also did some code reformating.