Minor code organization