A bunch of cleanup for this entry.