Address comments from PR review; fix sphinx ref errors; whitespace cleanup