Minor code organization improvement