Refactor config files

Make indentation more consistent