moved helper functions to their own source, modified Makefile accordingly