various style-fixes