cleanup
fix data