cleanup improvements