removed hardcoded strings