coding standards cleanup.