Last minute code cleanup