Add response wrap option, some codestyle fixes