Moving focus state into helper, and using for checkbox/radios