Fixed style bugs in previous commit: - don't comment out the old version; just modify it. - don't 2 sets of 3 style bugs that weren't present in the old version.
Fixed style bugs in previous commit:
- don't comment out the old version; just modify it.
- don't 2 sets of 3 style bugs that weren't present in the old version.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase