Update macro, style tweaks