code cleanup
debug