Style fixes for Pull-Request