Fix smallcaps and labels when reading yves. Little bit of code tidy