Make it read better and deal with branches.