Cleanup.
Code format improvements.