Revise indenting in applecore mode
Fix formatting in BTB