Fix single line config print + tidy some code.