Style tweaks
Formatting improvements