YAML produced now a lot cleaner and easier to read