Re-factoring and description.