refactor - small