Style tweaks following review feedback