Draft style tweaks
Merge cleanup