Code cleaning

Code cleaning