abc->ab and few other refacts