Ignore whitespace on concat operator.
Added docblocks and a bit more refactoring.