Clean up repetition