Code Readability Fix.

Consolidated main code line.
Now it is all together with subs below.