Code convention cleanup.