app -> sui, refactor