Formatting; remove dependency on conf module.