Small refactoring
Update documentation