cs cleanup
Merge pull request #39 from ddeboer/cs

cs cleanup