Cosmetic cleanup
cleaning up config - intermediate commit