formatting cleanup, logging adjustments