Code cleaning and debuging.