Removed duplicated messages a renamed those that were not meaningful