Testing refactor change