refactor variable names
factor out functions to helpers folder, fix Makefile path issue