More code review feedback: 'then' on its own line