Updated some redundancies