Simplify config; Clarify logging