Clean up. Extracted hardcoded values to configs