STYLE: Cleanup and comments.