Adding readme content + tidy up the helper code