Formatting and simplification changes. No material changes to code.