Merge "Code cleanup (9/n)"