Extracted default settings to constants
Removed unused parameters