Improve circle.yml