Cleanup
Use name rather than id for inputs