Style tweaks after #58