Re-write these without using additional classes in the <input> element (see comment above)