cleanup main.yml a little