Remove unnecessary conditional and assignment
Indicate unused block arg