A simplified and improved model of ideal and almost ideal silicon p-n junctions: the role of oxygen