remove redundant cast and check for wave at the end

remove redundant cast and check for wave at the end #22