Refactor to chunkify method on move messages