i know, i just do not refactor this method yet, and decide to do commit to prevent conflicts in case you'll decide to  make one more pull request.