Small refactoring + docstring notations