Code indentation

Also, a few minor changes.