Merge "Code layout cleanup"