I fixed this up - see what you think.