rename, style tweaks