refactoring changes - small