Code cleaning in progress