clean up, fix warning