CS fixes and improved docblocks

I don't like this change. I much prefer using a space between concatenation.