removed list tags + other tidying