Cleaning up assertions part 1