Doing some code cleanup