Refactoring + improve Trusted Host message