configuration optimizer
code improved