Improvements from production.

- Moved regex to single expression. WOOOOO!
- Sorted output.

Signed-off-by: Nick Tzaperas <nick@nijotz.com>