Merge "Code clean up" into tizen