clean up; more asserts