Disable debug messages; clean up source code
4 files changed