Eliminated redundant code.