Reorganize assertions