Project style implemented; Makefile fixed
Makefile bug fixed; unused functions removed from main file