style change and other trivial changes