Merge "Code cleanup (10/n)"