Style-related changes