Small refactoring
Small doc edit