Cleaning code : add/remove comments, variable names