Removed Code Redundance