tidying up to remove warnings