Cody tidy-up

Just some quick code clean-up here in the repo, and some changes/corrections done to the Makefile.