Tried to remove the Character ref from Criminal but it's just not going to work easily. Here's some more minor stuff instead.