change assertions
code cleanup