Clean up, improve style.