Minor code organization updates