Merge "Code clean up"