CS and docblock fixes