tidying up for initial release