Removed all hardcoded strings