Refactor - Fix deleted code + Improve docstring