Begin process of normalizing inline comments.  Re-arranging code for readability.