#51 tidying