Factorized and cleaned configuration.