Refactored Constants and Settings