Breakout some code paths
Tidy output path