cleaned up to comply to ODS-AP.
paul