Fixed some redundancy and improper assert uasge