removed a few hard coded strings