Refactoring of checks messages #139