Refactoring
JSON to YAML
Small prettyfication