Structural Changes

Removed Redundencies