Cleanup and better comment.