final? style tweaks