CheckStyle cleanup.