Small refactoring while documenting