cleanup
more improvements