cleanup in makeData