Clean up to meet ansible core coding guidelines.