Kleene star and some tidying.