Mention pure, some tidying