Refactoring + YAML parser