Code cleanup, some comments.