Restructure using class to make it easier to add settings