simplified and reorganized config