Cleanup, removed some comments.