refactor admin message format