Cleanup
Comments
Now atoms are plain Strings.