Fix config and formatting