Refactor movement indicator suggestion