Fixed formatting, removed unreachable code
Use local variable
formatting
Map form elements on own property