removing hardcoded strings