cleanup
fix timing