Little bit of tidying up around entity and help text