Wrapping up code cleanup