Round 3: address JJ's style nits