code cleaunup