update Makefile
cleanup code, add util.h, add pragma once