Prose fixes and refactoring