Cleanup and adding CrossTab class.