Some cleanup, comments.