CS and docblock fixes

Third of a few pulls to replace #6.
Could you revert this change? I did this intentionally.