Extend and reformat documentation