Fix style issues

Based on PullReview

cf #622