refactor: applied changes for pull request