Config clean up
re-factoring