More small style tweaks