added log config, and clean-up