Clean up src
Simplify spec runner