Merge "Code cleanup"