Addressing syntax and structure issues identified on last pull request #3185