Fix formatting
Fix makefile