style updates and coding tweaks