Fix apiary format issues