Cleaned up code/yaml.