Improve style.
Remove warnings.