Code format. Minor clean-ups.