Added some pop
Fixed some redundancy more left to do