fixing hard-coded strings and removed tabs