Merge "Formatting / Code styling."