Re-factored duplicated code