Minor refactor and edits of documentation