Small format changes and code clean up.