Cleaning up documentation for #299 and #304