Only import yaml when needed
Fixed comment