All tab indent; a little other formatting and whitespace clean up