Code Re-Factor