Indent
Remove some hard coded strings