Made changes to syntax as per agreed upon style guide.  

See commit message for comments.