cleaning copy paste code