Code cleaning done