Cleaned up the large-object id and highlight code.