Style tweaks based on @tpoulos's feedback