Code cleaning started