Some overall cleanup.