Code cleaning
CS