Revisit the README
factor out a header file