Cleaning Code up