Conforming to OISF standards.  Coding style changes.