Style tweeks
Fixing merge conflict