Cleanup Makefile and added ARM