Style for #2
Merge