Code cleaning....