Make settings an object, change a few things accordingly.