Cleanup, added comments.