Minor bug fix.
Code style changes.