- Removing hard-coded settings