rename & style tweaks