Code Re-factoring