more small cleaup