Aesthetics & fix ansible 1.5