Cleaned up some logical stuff.
Changed default statement & expression delimiters.