Some tidying to prep for a public release/test