cleanup
debug enhancement