data + cleanup in code