refactor and add new INFO message