Remove button element scoping to lessen selector specificity, clean up a single use var