drop some debug logging, spacing cleanup