some style cleanup and copy updates