Merge "Make code sections readable and consistent"