Fix whitespace.
Small refactoring.
Updated time based UUID sorting to include other parts.

It would be nice to get an "authority on time based UUID sorting" to ack this.