various style fixes