Refactored Settings into a class