Move the code closer to synopsis and more explicit Penn bracketing