General code cleanup.
General code cleanup.

nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus