Ran some code cleanup