docblock and class usage update