Cleanup for coding standard.