slight cleaup