reorganize asserts