refactoring - small fix