Cleanup, comment, add exception string