what about doing the same for type="submit" and type="button" above? Anywhere else where we can do the same?