cleanup. update yaml parser