Enhanced cleanup and formatter config