worker.c refactor
Message refactor