reorginized
removed logger