last typo & tidying