ydm: cosmetic changes #3