Try to make things slightly more React idiomatc