Removed hardcoded strings