Re-factoring done