Better grouping.

Removed CPPText as it causes issues on classes using it.
Merge pull request #4 from EliotVU/syntax

Better grouping(Update to previous request)