Beautifications and removed commented-out code.
Beautifications and removed commented-out code.

onixie/mcclim,swflint/McCLIM,slyrus/mcclim,swflint/McCLIM,swflint/McCLIM,onixie/mcclim,slyrus/mcclim,onixie/mcclim