Settings: Made options code easier to read