better config
cleanup