style-related fixes