misc stylistic changes