Merge "Code cleaning"