Replaced and upgraded superfluous redundancies