Revise formatting, makefile in BTB