Style tweaks and that