Code Organization Concepts: Fix syntax error

Closes gh-576
Fixes gh-544