Update code to be 'make'-able