Cleaned up YAML code, made utility.data pacakage