Tided up duplicate a little