Refactor Makefile
Fix style