Update Makefile and formatting in core.py.