Fix formatting in some base files