Did more cleaning-up of code.