Minor code organization fix