Addressing doc comments