Fix specs, Cleanup