Merge "Code cleanup (13/n)"