Clean up case statement.
Complete refactor of segmenter running.