Eliminated redundant code