update docblocks, method names