Minor refactor and doc updates