Refactor attempt slightly
Cleanup router specs