cleaned up assertions