Further code review feedback: indentation and eliminating a variable