Minor format improvements to the code (no actual changes to the logic).