Cleanup, add spec