Small cleanup
CLEANUP: Documentation and debug messages