[Pierre] Exit early, and reduce indenting