Cleaning code Merge