tweaked code organization