Style improvements
Conflict resolved