Style improvements, organised config setting.