Move editable cases outside of loop