Fix indenting, add minor adjustments, set private address.