Tweak doc strings and minor code reformat.