Improved indentation
Fixed up some shell prompts