Reformat code
Merge remote-tracking branch 'origin/after_review' into after_review