Minor cleanup
Add debug messages