Code reorganization of init file.
Config correction.