Tidying up a bit for public release