More cosmetic and readability cleaning.

Just cleaning up and improving readability.