organizing code

nothing much