Interface cleanup and comments.