[CODE STYLE] Several Codestyle fixes. Fix #3028, Fix #3029, Fix #3030, Fix #3031, Fix #3032, Fix #3033, Fix #3034, Fix #3035, Fix #3036, Fix #3037, Fix #3040, Fix #3041, Fix #3042, Fix #3043