change a bit of code organization