Style tweaks and formatting