refactor naming + remove docstring