Consolidated, cleaned up the solution