apache refact
more cleanup