started cleaning code